userWidget: Actually respect the iconSize parameter

The iconSize parameter was only being respected if it was the
default icon fallback.

https://bugzilla.gnome.org/show_bug.cgi?id=706681

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 5838cde2a0ad5a902da98feb3bfd379079e6c3b5..320c430135213eda54c1d2239e3d26cc3ab38d61 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -2244,8 +2244,6 @@ StScrollBar StButton#vhandle:active {
 .framed-user-icon {
     border: 2px solid #8b8b8b;
     border-radius: 5px;
-    width: 48pt;
-    height: 48pt;
     background-size: contain;
 }
 

diff --git a/js/ui/userWidget.js b/js/ui/userWidget.js
index 47c28aad019729a5e9725552d61b886aea254cff..f801a543925f98f946316e63021c9b7dc6f3afe2 100644 (file)
--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@@ -29,7 +29,9 @@ const Avatar = new Lang.Class({
 
         this.actor = new St.Bin({ style_class: params.styleClass,
                                   track_hover: params.reactive,
-                                  reactive: params.reactive });
+                                  reactive: params.reactive,
+                                  width: this._iconSize,
+                                  height: this._iconSize });
     },
 
     setSensitive: function(sensitive) {